More of the mechanical warning drugery between naps.

diff --git a/f90g_track.cc b/f90g_track.cc
index 134347fc05a8d51240b5ca4bdcb193c8c501aefb..eb1bf828ca09b1573f8a0413e4595b76d5ac73d1 100644 (file)
--- a/f90g_track.cc
+++ b/f90g_track.cc
@@ -156,4 +156,6 @@ ff_vecs_t f90g_track_vecs = {
   f90g_track_args,
   CET_CHARSET_UTF8, 0                  /* ascii is the expected character set */
   /* not fixed, can be changed through command line parameter */
+  , NULL_POS_OPS,
+  nullptr
 };

diff --git a/g7towin.cc b/g7towin.cc
index 1e0997b4f8a635b64a688c8f47ed57f2465ec489..bd474b07de6d8de5704b77d04e106badf864d1b4 100644 (file)
--- a/g7towin.cc
+++ b/g7towin.cc
@@ -595,6 +595,8 @@ ff_vecs_t g7towin_vecs = {
   NULL,
   g7towin_args,
   CET_CHARSET_MS_ANSI, 0
+  , NULL_POS_OPS,
+  nullptr
 };
 
 #endif /* CSVFMTS_ENABLED */

diff --git a/garmin.cc b/garmin.cc
index 8639d775d8621666ba278cafcab5d11106b0a952..98ec1777b0b89cfa56df45629129c97d5b880024 100644 (file)
--- a/garmin.cc
+++ b/garmin.cc
@@ -67,40 +67,40 @@ static
 arglist_t garmin_args[] = {
   {
     "snlen", &snlen, "Length of generated shortnames", NULL,
-    ARGTYPE_INT, "1", NULL
+    ARGTYPE_INT, "1", NULL, nullptr
   },
   {
     "snwhite", &snwhiteopt, "Allow whitespace synth. shortnames",
-    NULL, ARGTYPE_BOOL, ARG_NOMINMAX
+    NULL, ARGTYPE_BOOL, ARG_NOMINMAX, nullptr
   },
-  { "deficon", &deficon, "Default icon name", NULL, ARGTYPE_STRING, ARG_NOMINMAX },
+  { "deficon", &deficon, "Default icon name", NULL, ARGTYPE_STRING, ARG_NOMINMAX, nullptr },
   {
     "get_posn", &getposn, "Return current position as a waypoint",
-    NULL, ARGTYPE_BOOL, ARG_NOMINMAX
+    NULL, ARGTYPE_BOOL, ARG_NOMINMAX, nullptr
   },
   {
     "power_off", &poweroff, "Command unit to power itself down",
-    NULL, ARGTYPE_BOOL, ARG_NOMINMAX
+    NULL, ARGTYPE_BOOL, ARG_NOMINMAX, nullptr
   },
   {
     "erase_t", &eraset, "Erase existing courses when writing new ones",
-    NULL, ARGTYPE_BOOL, ARG_NOMINMAX
+    NULL, ARGTYPE_BOOL, ARG_NOMINMAX, nullptr
   },
   {
     "resettime", &resettime, "Sync GPS time to computer time",
-    NULL, ARGTYPE_BOOL, ARG_NOMINMAX
+    NULL, ARGTYPE_BOOL, ARG_NOMINMAX, nullptr
   },
   {
     "category", &category, "Category number to use for written waypoints",
-    NULL, ARGTYPE_INT, "1", "16"
+    NULL, ARGTYPE_INT, "1", "16", nullptr
   },
   {
     "bitscategory", &categorybitsopt, "Bitmap of categories",
-    NULL, ARGTYPE_INT, "1", "65535"
+    NULL, ARGTYPE_INT, "1", "65535", nullptr
   },
   {
     "baud", &baudopt, "Speed in bits per second of serial port (baud=9600)",
-    NULL, ARGTYPE_INT, ARG_NOMINMAX },
+    NULL, ARGTYPE_INT, ARG_NOMINMAX, nullptr },
 
   ARG_TERMINATOR
 };
@@ -1275,7 +1275,8 @@ ff_vecs_t garmin_vecs = {
   NULL,
   garmin_args,
   CET_CHARSET_ASCII, 0,
-  { pvt_init, pvt_read, rw_deinit, NULL, NULL, NULL }
+  { pvt_init, pvt_read, rw_deinit, NULL, NULL, NULL },
+  nullptr
 };
 
 static const char* d103_icons[16] = {

diff --git a/garmin_fit.cc b/garmin_fit.cc
index 61ee47d0f1d2b9d5131a8bff5e5b23a180bb224f..3b2f27fd79aba5c5d208290e13162f34888b940c 100644 (file)
--- a/garmin_fit.cc
+++ b/garmin_fit.cc
@@ -698,5 +698,7 @@ ff_vecs_t format_fit_vecs = {
   fit_args,
   CET_CHARSET_ASCII, 0         /* ascii is the expected character set */
   /* not fixed, can be changed through command line parameter */
+  , NULL_POS_OPS,
+  nullptr
 };
 /**************************************************************************/

diff --git a/garmin_gpi.cc b/garmin_gpi.cc
index 98093dc7958f15141c659a148b48e699121088f9..55df4311e3a6371551d314d09e1a45048f85c2b5 100644 (file)
--- a/garmin_gpi.cc
+++ b/garmin_gpi.cc
@@ -76,55 +76,55 @@ static int alerts;
 static arglist_t garmin_gpi_args[] = {
   {
     "alerts", &opt_alerts, "Enable alerts on speed or proximity distance",
-    NULL, ARGTYPE_BOOL, ARG_NOMINMAX
+    NULL, ARGTYPE_BOOL, ARG_NOMINMAX, nullptr
   },
   {
     "bitmap", &opt_bitmap, "Use specified bitmap on output",
-    NULL, ARGTYPE_FILE, ARG_NOMINMAX
+    NULL, ARGTYPE_FILE, ARG_NOMINMAX, nullptr
   },
   {
     "category", &opt_cat, "Default category on output",
-    "My points", ARGTYPE_STRING, ARG_NOMINMAX
+    "My points", ARGTYPE_STRING, ARG_NOMINMAX, nullptr
   },
   {
     "hide", &opt_hide_bitmap, "Don't show gpi bitmap on device",
-    NULL, ARGTYPE_BOOL, ARG_NOMINMAX
+    NULL, ARGTYPE_BOOL, ARG_NOMINMAX, nullptr
   },
   {
     "descr", &opt_descr, "Write description to address field",
-    NULL, ARGTYPE_BOOL, ARG_NOMINMAX
+    NULL, ARGTYPE_BOOL, ARG_NOMINMAX, nullptr
   },
   {
     "notes", &opt_notes, "Write notes to address field",
-    NULL, ARGTYPE_BOOL, ARG_NOMINMAX
+    NULL, ARGTYPE_BOOL, ARG_NOMINMAX, nullptr
   },
   {
     "position", &opt_pos, "Write position to address field",
-    NULL, ARGTYPE_BOOL, ARG_NOMINMAX
+    NULL, ARGTYPE_BOOL, ARG_NOMINMAX, nullptr
   },
   {
     "proximity", &opt_proximity, "Default proximity",
-    NULL, ARGTYPE_STRING, ARG_NOMINMAX
+    NULL, ARGTYPE_STRING, ARG_NOMINMAX, nullptr
   },
   {
     "sleep", &opt_sleep, "After output job done sleep n second(s)",
-    NULL, ARGTYPE_INT, "1", NULL
+    NULL, ARGTYPE_INT, "1", NULL, nullptr
   },
   {
     "speed", &opt_speed, "Default speed",
-    NULL, ARGTYPE_STRING, ARG_NOMINMAX
+    NULL, ARGTYPE_STRING, ARG_NOMINMAX, nullptr
   },
   {
     "unique", &opt_unique, "Create unique waypoint names (default = yes)",
-    "Y", ARGTYPE_BOOL, ARG_NOMINMAX
+    "Y", ARGTYPE_BOOL, ARG_NOMINMAX, nullptr
   },
   {
     "units", &opt_units, "Units used for names with @speed ('s'tatute or 'm'etric)",
-    "m", ARGTYPE_STRING, ARG_NOMINMAX
+    "m", ARGTYPE_STRING, ARG_NOMINMAX, nullptr
   },
   {
     "writecodec", &opt_writecodec, "codec to use for writing strings",
-    "windows-1252", ARGTYPE_STRING, ARG_NOMINMAX
+    "windows-1252", ARGTYPE_STRING, ARG_NOMINMAX, nullptr
   },
   ARG_TERMINATOR
 };
@@ -299,7 +299,7 @@ gpi_read_string(const char* field)
 }
 
 static void
-read_header(void)
+read_header()
 {
   int len, i;
 #ifdef GPI_DBG
@@ -511,6 +511,7 @@ read_poi_group(const int sz, const int tag)
 static int
 read_tag(const char* caller, const int tag, Waypoint* wpt)
 {
+  Q_UNUSED(caller);
   int pos, sz, dist;
   double speed;
   short mask;
@@ -1184,7 +1185,7 @@ skip_empty_block:
 
 
 static void
-write_category(const char* category, const unsigned char* image, const int image_sz)
+write_category(const char*, const unsigned char* image, const int image_sz)
 {
   int sz;
 
@@ -1212,7 +1213,7 @@ write_category(const char* category, const unsigned char* image, const int image
 
 
 static void
-write_header(void)
+write_header()
 {
   time_t time = gpi_timestamp;
 
@@ -1531,7 +1532,7 @@ garmin_gpi_wr_init(const QString& fname)
 
 
 static void
-garmin_gpi_rd_deinit(void)
+garmin_gpi_rd_deinit()
 {
   delete rdata;
   gbfclose(fin);
@@ -1539,7 +1540,7 @@ garmin_gpi_rd_deinit(void)
 
 
 static void
-garmin_gpi_wr_deinit(void)
+garmin_gpi_wr_deinit()
 {
   wdata_free(wdata);
   mkshort_del_handle(&short_h);
@@ -1559,7 +1560,7 @@ garmin_gpi_wr_deinit(void)
 
 
 static void
-garmin_gpi_read(void)
+garmin_gpi_read()
 {
   while (1) {
     int tag = gbfgetint32(fin);
@@ -1574,7 +1575,7 @@ garmin_gpi_read(void)
 
 
 static void
-garmin_gpi_write(void)
+garmin_gpi_write()
 {
   unsigned char* image;
   int image_sz;
@@ -1624,6 +1625,8 @@ ff_vecs_t garmin_gpi_vecs = {
   NULL,
   garmin_gpi_args,
   CET_CHARSET_MS_ANSI, 0               /* WIN-CP1252 */
+  , NULL_POS_OPS,
+  nullptr
 };
 
 /**************************************************************************/

diff --git a/garmin_txt.cc b/garmin_txt.cc
index 93e3f2b1745183fa47d2a426cd06fa1159600b17..ee62e9dcd8cb90d570f225350bf972dd88208006 100644 (file)
--- a/garmin_txt.cc
+++ b/garmin_txt.cc
@@ -114,14 +114,14 @@ static char* opt_grid = NULL;
 
 static
 arglist_t garmin_txt_args[] = {
-  {"date",  &opt_date_format, "Read/Write date format (i.e. yyyy/mm/dd)", NULL, ARGTYPE_STRING, ARG_NOMINMAX},
-  {"datum", &opt_datum,            "GPS datum (def. WGS 84)", "WGS 84", ARGTYPE_STRING, ARG_NOMINMAX},
+  {"date",  &opt_date_format, "Read/Write date format (i.e. yyyy/mm/dd)", NULL, ARGTYPE_STRING, ARG_NOMINMAX, nullptr},
+  {"datum", &opt_datum,            "GPS datum (def. WGS 84)", "WGS 84", ARGTYPE_STRING, ARG_NOMINMAX, nullptr},
   {"dist",  &opt_dist,        "Distance unit [m=metric, s=statute]", "m", ARGTYPE_STRING, ARG_NOMINMAX},
-  {"grid",  &opt_grid,        "Write position using this grid.", NULL, ARGTYPE_STRING, ARG_NOMINMAX},
-  {"prec",  &opt_precision,   "Precision of coordinates", "3", ARGTYPE_INT, ARG_NOMINMAX},
-  {"temp",  &opt_temp,        "Temperature unit [c=Celsius, f=Fahrenheit]", "c", ARGTYPE_STRING, ARG_NOMINMAX},
-  {"time",  &opt_time_format, "Read/Write time format (i.e. HH:mm:ss xx)", NULL, ARGTYPE_STRING, ARG_NOMINMAX},
-  {"utc",   &opt_utc,         "Write timestamps with offset x to UTC time", NULL, ARGTYPE_INT, "-23", "+23"},
+  {"grid",  &opt_grid,        "Write position using this grid.", NULL, ARGTYPE_STRING, ARG_NOMINMAX, nullptr},
+  {"prec",  &opt_precision,   "Precision of coordinates", "3", ARGTYPE_INT, ARG_NOMINMAX, nullptr},
+  {"temp",  &opt_temp,        "Temperature unit [c=Celsius, f=Fahrenheit]", "c", ARGTYPE_STRING, ARG_NOMINMAX, nullptr},
+  {"time",  &opt_time_format, "Read/Write time format (i.e. HH:mm:ss xx)", NULL, ARGTYPE_STRING, ARG_NOMINMAX, nullptr},
+  {"utc",   &opt_utc,         "Write timestamps with offset x to UTC time", NULL, ARGTYPE_INT, "-23", "+23", nullptr},
   ARG_TERMINATOR
 };
 
@@ -162,7 +162,7 @@ get_option_val(const char* option, const char* def)
 }
 
 static void
-init_date_and_time_format(void)
+init_date_and_time_format()
 {
   const char* f;
   const char* c;
@@ -235,7 +235,7 @@ sort_waypt_cb(const void* a, const void* b)
 /* common route and track pre-work */
 
 static void
-prework_hdr_cb(const route_head* rte)
+prework_hdr_cb(const route_head*)
 {
   cur_info = &route_info[route_idx];
   cur_info->prev_wpt = NULL;
@@ -244,7 +244,7 @@ prework_hdr_cb(const route_head* rte)
 }
 
 static void
-prework_tlr_cb(const route_head* rte)
+prework_tlr_cb(const route_head*)
 {
   cur_info->last_wpt = cur_info->prev_wpt;
   route_idx++;
@@ -649,7 +649,7 @@ route_disp_hdr_cb(const route_head* rte)
 }
 
 static void
-route_disp_tlr_cb(const route_head* rte)
+route_disp_tlr_cb(const route_head*)
 {
   route_idx++;
 }
@@ -702,7 +702,7 @@ track_disp_hdr_cb(const route_head* track)
 }
 
 static void
-track_disp_tlr_cb(const route_head* track)
+track_disp_tlr_cb(const route_head*)
 {
   route_idx++;
 }
@@ -809,14 +809,14 @@ garmin_txt_wr_init(const QString& fname)
 }
 
 static void
-garmin_txt_wr_deinit(void)
+garmin_txt_wr_deinit()
 {
   gbfclose(fout);
   xfree(date_time_format);
 }
 
 static void
-garmin_txt_write(void)
+garmin_txt_write()
 {
   char* grid_str, *c;
   const char* datum_str;
@@ -988,7 +988,7 @@ parse_temperature(const char* str, double* temperature)
 }
 
 static void
-parse_header(void)
+parse_header()
 {
   char* str;
   int column = -1;
@@ -1072,7 +1072,7 @@ bind_fields(const header_type ht)
 }
 
 static void
-parse_grid(void)
+parse_grid()
 {
   char* str = csv_lineparse(NULL, "\t", "", 1);
 
@@ -1092,7 +1092,7 @@ parse_grid(void)
 }
 
 static void
-parse_datum(void)
+parse_datum()
 {
   char* str = csv_lineparse(NULL, "\t", "", 1);
 
@@ -1104,7 +1104,7 @@ parse_datum(void)
 }
 
 static void
-parse_waypoint(void)
+parse_waypoint()
 {
   char* str;
   int column = -1;
@@ -1208,7 +1208,7 @@ parse_waypoint(void)
 }
 
 static void
-parse_route_header(void)
+parse_route_header()
 {
   char* str;
   int column = -1;
@@ -1233,7 +1233,7 @@ parse_route_header(void)
 }
 
 static void
-parse_track_header(void)
+parse_track_header()
 {
   char* str;
   int column = -1;
@@ -1257,7 +1257,7 @@ parse_track_header(void)
 }
 
 static void
-parse_route_waypoint(void)
+parse_route_waypoint()
 {
   char* str;
   int column = -1;
@@ -1282,7 +1282,7 @@ parse_route_waypoint(void)
 }
 
 static void
-parse_track_waypoint(void)
+parse_track_waypoint()
 {
   char* str;
   int column = -1;
@@ -1357,7 +1357,7 @@ garmin_txt_rd_init(const QString& fname)
 }
 
 static void
-garmin_txt_rd_deinit(void)
+garmin_txt_rd_deinit()
 {
   header_type h;
 
@@ -1369,7 +1369,7 @@ garmin_txt_rd_deinit(void)
 }
 
 static void
-garmin_txt_read(void)
+garmin_txt_read()
 {
   char* buff;
 
@@ -1431,6 +1431,8 @@ ff_vecs_t garmin_txt_vecs = {
   NULL,
   garmin_txt_args,
   CET_CHARSET_MS_ANSI, 0
+  , NULL_POS_OPS,
+  nullptr
 };
 
 #endif // CSVFMTS_ENABLED

diff --git a/garmin_xt.cc b/garmin_xt.cc
index b91e98e2e7d6d22e83ce4a1d9056e7b948d4f8cc..af45eb205a1c7461dd9c61640dfa1ac8b0068e90 100644 (file)
--- a/garmin_xt.cc
+++ b/garmin_xt.cc
@@ -57,10 +57,10 @@ static char*        opt_trk_header = NULL;
 
 static
 arglist_t format_garmin_xt_args[] = {
-  {"ftype", &opt_xt_ftype, "Garmin Mobile XT ([ATRK]/STRK)", "ATRK", ARGTYPE_STRING | ARGTYPE_REQUIRED, ARG_NOMINMAX},
+  {"ftype", &opt_xt_ftype, "Garmin Mobile XT ([ATRK]/STRK)", "ATRK", ARGTYPE_STRING | ARGTYPE_REQUIRED, ARG_NOMINMAX, nullptr},
   // TODO: SHIFT - can't test behaviour, do not have appropriate files
   //{"trk_header_opt", &opt_trk_header, "Track name processing option ([0]-nrm/1-ign/2-sht)", "0", ARGTYPE_INT, ARG_NOMINMAX},
-  {"trk_header", &opt_trk_header, "Track name processing option ([0]-nrm/1-ign)", "0", ARGTYPE_INT, ARG_NOMINMAX},
+  {"trk_header", &opt_trk_header, "Track name processing option ([0]-nrm/1-ign)", "0", ARGTYPE_INT, ARG_NOMINMAX, nullptr},
   ARG_TERMINATOR
 };
 
@@ -433,5 +433,7 @@ ff_vecs_t format_garmin_xt_vecs = {
   format_garmin_xt_args,
   CET_CHARSET_ASCII, 0                 /* ascii is the expected character set */
   /* not fixed, can be changed through command line parameter */
+  , NULL_POS_OPS,
+  nullptr
 };
 /**************************************************************************/

diff --git a/gdb.cc b/gdb.cc
index 7060c63878828f6fd6367e6aae890773d6c8ba7b..bb4b87433bd7d92826e037f6ecf57160f71e8d2b 100644 (file)
--- a/gdb.cc
+++ b/gdb.cc
@@ -1891,6 +1891,8 @@ ff_vecs_t gdb_vecs = {
   gdb_args,
   CET_CHARSET_MS_ANSI, 0       /* O.K.: changed to NON-FIXED */
   /* because of utf8 strings since GDB V3 */
+  , NULL_POS_OPS,
+  nullptr
 };
 
 /*******************************************************************************/

diff --git a/geo.cc b/geo.cc
index e6f4560a0daccb4d4a4366cd67f8ca6f8f544e02..11efc1cdbfd067de075a647b5f3c403c2edab7cb 100644 (file)
--- a/geo.cc
+++ b/geo.cc
@@ -30,8 +30,8 @@ static QXmlStreamWriter writer(&ostring);
 
 static
 arglist_t geo_args[] = {
-  {"deficon", &deficon, "Default icon name", NULL, ARGTYPE_STRING, ARG_NOMINMAX },
-  {"nuke_placer", &nuke_placer, "Omit Placer name", NULL, ARGTYPE_BOOL, ARG_NOMINMAX },
+  {"deficon", &deficon, "Default icon name", NULL, ARGTYPE_STRING, ARG_NOMINMAX, nullptr },
+  {"nuke_placer", &nuke_placer, "Omit Placer name", NULL, ARGTYPE_BOOL, ARG_NOMINMAX, nullptr },
   ARG_TERMINATOR
 };
 
@@ -267,5 +267,7 @@ ff_vecs_t geo_vecs = {
   geo_write,
   NULL,
   geo_args,
-  CET_CHARSET_UTF8, 0  /* CET-REVIEW */
+  CET_CHARSET_UTF8, 0, /* CET-REVIEW */
+  NULL_POS_OPS,
+  nullptr
 };

diff --git a/geojson.cc b/geojson.cc
index 20c05ea937791094dfe1804c01a871bb33b5ffac..90d9482fd8d1a18290591a278b4e58ddc0b3b937 100644 (file)
--- a/geojson.cc
+++ b/geojson.cc
@@ -49,7 +49,7 @@ static const QString URLNAME = QStringLiteral("urlname");
 
 static arglist_t geojson_args[] = {
   {"compact", &compact_opt, "Compact Output. Default is off.", 
-    NULL, ARGTYPE_BOOL, ARG_NOMINMAX } ,
+    NULL, ARGTYPE_BOOL, ARG_NOMINMAX, nullptr } ,
   ARG_TERMINATOR
 };
 
@@ -113,7 +113,7 @@ geojson_rd_deinit() {
 }
 
 static void
-geojson_wr_deinit(void) {
+geojson_wr_deinit() {
   QJsonObject object;
   object[TYPE] = FEATURE_COLLECTION;
   object[FEATURES]  = *feature_collection;
@@ -159,7 +159,7 @@ routes_from_polygon_coordinates(const QJsonArray& polygon)
 }
 
 static void
-geojson_read(void) {
+geojson_read() {
        QFile file;
        file.setFileName(input_file_name);
        file.open(QIODevice::ReadOnly | QIODevice::Text);
@@ -293,7 +293,7 @@ static void geojson_track_disp(const Waypoint* trackpoint) {
   (*track_coords).append(coords);
 }
 
-static void geojson_track_tlr(const route_head* track) {
+static void geojson_track_tlr(const route_head*) {
   QJsonObject geometry;
   geometry[TYPE] = LINESTRING;
   geometry[COORDINATES] = *track_coords;
@@ -306,7 +306,7 @@ static void geojson_track_tlr(const route_head* track) {
 }
 
 static void
-geojson_write(void) {
+geojson_write() {
   waypt_disp_all(geojson_waypt_pr);
   track_disp_all(geojson_track_hdr, geojson_track_tlr, geojson_track_disp);
 }
@@ -327,4 +327,6 @@ ff_vecs_t geojson_vecs = {
   NULL,
   geojson_args,
   CET_CHARSET_UTF8, 0  /* CET-REVIEW */
+  , NULL_POS_OPS,
+  nullptr  
 };

diff --git a/ggv_bin.cc b/ggv_bin.cc
index 6c87e2dc37167e1da04bf12c898f6c61a579407b..94f5a1ab856ee57bcfee91e2abcdd8348e751563 100644 (file)
--- a/ggv_bin.cc
+++ b/ggv_bin.cc
@@ -518,4 +518,6 @@ ff_vecs_t ggv_bin_vecs = {
   NULL,                 //args
   CET_CHARSET_ASCII, 0  //encode,fixed_encode
   //NULL                //name dynamic/internal?
+  , NULL_POS_OPS,
+  nullptr
 };

diff --git a/ggv_log.cc b/ggv_log.cc
index c026bee547dac288c14d5476f02981453bbad3f2..71a0249ce430639ccbc0771aabde86b21b127590 100644 (file)
--- a/ggv_log.cc
+++ b/ggv_log.cc
@@ -288,5 +288,7 @@ ff_vecs_t ggv_log_vecs = {
   NULL,
   ggv_log_args,
   CET_CHARSET_ASCII, 1
+  , NULL_POS_OPS,
+  nullptr
 };
 /**************************************************************************/

diff --git a/ggv_ovl.cc b/ggv_ovl.cc
index ae7c22bf60d3453a3df9eaaebd70c4edce5b92b6..f53209a3c9cc2ae81df37b04b29a5a7bfe5bc625 100644 (file)
--- a/ggv_ovl.cc
+++ b/ggv_ovl.cc
@@ -461,6 +461,8 @@ ff_vecs_t ggv_ovl_vecs = {
   NULL,
   ggv_ovl_args,
   CET_CHARSET_MS_ANSI, 0
+  , NULL_POS_OPS,
+  nullptr
 };
 
 /**************************************************************************/

diff --git a/globalsat_sport.cc b/globalsat_sport.cc
index 43cd8b2d16ecf98842722434de815832cdcfd5c6..ec20d363ebe2b8b399edd4bd0732a260cc87531c 100644 (file)
--- a/globalsat_sport.cc
+++ b/globalsat_sport.cc
@@ -57,10 +57,10 @@ static gbfile* in_file = NULL;              // used for reading from bin/RAW dat
 
 static
 arglist_t globalsat_args[] = {
-  {"showlist", &showlist, "list tracks", NULL, ARGTYPE_BOOL, ARG_NOMINMAX},
-  {"track", &track, "get track", "0", ARGTYPE_INT, ARG_NOMINMAX},
-  {"dump-file", &opt_dump_file, "Dump raw data to this file", NULL, ARGTYPE_OUTFILE, ARG_NOMINMAX},
-  {"input-is-dump-file", &opt_input_dump_file, "Dump raw data to this file", NULL, ARGTYPE_BOOL, ARG_NOMINMAX},
+  {"showlist", &showlist, "list tracks", NULL, ARGTYPE_BOOL, ARG_NOMINMAX, nullptr},
+  {"track", &track, "get track", "0", ARGTYPE_INT, ARG_NOMINMAX, nullptr},
+  {"dump-file", &opt_dump_file, "Dump raw data to this file", NULL, ARGTYPE_OUTFILE, ARG_NOMINMAX, nullptr},
+  {"input-is-dump-file", &opt_input_dump_file, "Dump raw data to this file", NULL, ARGTYPE_BOOL, ARG_NOMINMAX, nullptr},
   ARG_TERMINATOR
 };
 
@@ -857,6 +857,8 @@ ff_vecs_t globalsat_sport_vecs = {
   globalsat_args,              //args
   CET_CHARSET_ASCII, 0         //encode,fixed_encode
   //NULL                   //name dynamic/internal?
+  , NULL_POS_OPS,
+  nullptr
 };
 
 // This reads from a RAW dump bile from a watch
@@ -876,4 +878,6 @@ ff_vecs_t globalsat_sport_fvecs = {
   globalsat_args,              //args
   CET_CHARSET_ASCII, 0         //encode,fixed_encode
   //NULL                   //name dynamic/internal?
+  , NULL_POS_OPS,
+  nullptr
 };

diff --git a/glogbook.cc b/glogbook.cc
index 2ab3de4781cb28b171af6dca4e884dae2da5a50f..040dc0d9ba4fcf98f18914c575bfa6b18b977473 100644 (file)
--- a/glogbook.cc
+++ b/glogbook.cc
@@ -112,13 +112,13 @@ glogbook_waypt_pr(const Waypoint* wpt)
 }
 
 static void
-glogbook_hdr(const route_head* rte)
+glogbook_hdr(const route_head*)
 {
   writer.writeStartElement("Track");
 }
 
 static void
-glogbook_ftr(const route_head* rte)
+glogbook_ftr(const route_head*)
 {
   writer.writeEndElement();
 }
@@ -139,18 +139,18 @@ glogbook_write(void)
   writer.writeEndElement(); // History
 }
 
-void   gl_trk_s(xg_string args, const QXmlStreamAttributes*)
+void   gl_trk_s(xg_string, const QXmlStreamAttributes*)
 {
   trk_head = route_head_alloc();
   track_add_head(trk_head);
 }
 
-void   gl_trk_pnt_s(xg_string args, const QXmlStreamAttributes*)
+void   gl_trk_pnt_s(xg_string, const QXmlStreamAttributes*)
 {
   wpt_tmp = new Waypoint;
 }
 
-void   gl_trk_pnt_e(xg_string args, const QXmlStreamAttributes*)
+void   gl_trk_pnt_e(xg_string, const QXmlStreamAttributes*)
 {
   track_add_wpt(trk_head, wpt_tmp);
 }
@@ -189,4 +189,6 @@ ff_vecs_t glogbook_vecs = {
   NULL,
   glogbook_args,
   CET_CHARSET_ASCII, 0 /* CET-REVIEW */
+  , NULL_POS_OPS,
+  nullptr
 };

diff --git a/gnav_trl.cc b/gnav_trl.cc
index efbdc2fd795b96ff1593a4961d088cec6b401f90..1f4c79a64e464691055124753095236ea159588e 100644 (file)
--- a/gnav_trl.cc
+++ b/gnav_trl.cc
@@ -154,6 +154,8 @@ ff_vecs_t gnav_trl_vecs = {
   NULL,
   gnav_trl_args,
   CET_CHARSET_UTF8, 1  /* CET - do nothing ! */
+  , NULL_POS_OPS,
+  nullptr
 
 };
 

diff --git a/googledir.cc b/googledir.cc
index 3058958c4ea690f06571ce7d100bec1ab526fb8d..514face067da0bfc32bce38c1a926ae2943e3c57 100644 (file)
--- a/googledir.cc
+++ b/googledir.cc
@@ -167,4 +167,6 @@ ff_vecs_t google_dir_vecs = {
   NULL,
   NULL,
   CET_CHARSET_UTF8, 1  /* CET-REVIEW */
+  , NULL_POS_OPS,
+  nullptr
 };

diff --git a/gopal.cc b/gopal.cc
index 95ee92bbd7d674cfccc6c40644b49e7d8694009e..8438342b15a3676f709b88cf41e45a274bb7bece 100644 (file)
--- a/gopal.cc
+++ b/gopal.cc
@@ -73,10 +73,10 @@ static double minspeed,maxspeed;
 static struct tm opt_tm;       /* converted "date" parameter */
 static
 arglist_t gopal_args[] = {
-  {"date", &optdate, "Complete date-free tracks with given date (YYYYMMDD).", NULL, ARGTYPE_INT, ARG_NOMINMAX },
-  {"maxspeed", &optmaxspeed, "The maximum speed (km/h) traveling from waypoint to waypoint.", "200", ARGTYPE_INT, "1", "1000" },
-  {"minspeed", &optminspeed, "The minimum speed (km/h) traveling from waypoint to waypoint. Set >0 to remove duplicate waypoints", "0", ARGTYPE_INT, "0", "999" },
-  {"clean", &optclean, "Cleanup common errors in trackdata", "1", ARGTYPE_BOOL, ARG_NOMINMAX },
+  {"date", &optdate, "Complete date-free tracks with given date (YYYYMMDD).", NULL, ARGTYPE_INT, ARG_NOMINMAX, nullptr },
+  {"maxspeed", &optmaxspeed, "The maximum speed (km/h) traveling from waypoint to waypoint.", "200", ARGTYPE_INT, "1", "1000", nullptr },
+  {"minspeed", &optminspeed, "The minimum speed (km/h) traveling from waypoint to waypoint. Set >0 to remove duplicate waypoints", "0", ARGTYPE_INT, "0", "999", nullptr },
+  {"clean", &optclean, "Cleanup common errors in trackdata", "1", ARGTYPE_BOOL, ARG_NOMINMAX, nullptr },
   ARG_TERMINATOR
 };
 
@@ -158,13 +158,13 @@ gopal_rd_init(const QString& fname)
 }
 
 static void
-gopal_rd_deinit(void)
+gopal_rd_deinit()
 {
   gbfclose(fin);
 }
 
 static void
-gopal_read(void)
+gopal_read()
 {
 
   char* buff;
@@ -335,13 +335,13 @@ gopal_read(void)
 }
 
 static void
-gopal_route_hdr(const route_head* route)
+gopal_route_hdr(const route_head*)
 {
 
 }
 
 static void
-gopal_route_tlr(const route_head* rte)
+gopal_route_tlr(const route_head*)
 {
 }
 
@@ -381,19 +381,19 @@ gopal_wr_init(const QString& fname)
 }
 
 static void
-gopal_wr_deinit(void)
+gopal_wr_deinit()
 {
   gbfclose(fout);
 }
 
 static void
-gopal_write(void)
+gopal_write()
 {
   route_disp_all(gopal_route_hdr, gopal_route_tlr, gopal_write_waypt);
 }
 
 static void
-gopal_exit(void)               /* optional */
+gopal_exit()           /* optional */
 {
 }
 
@@ -419,5 +419,7 @@ ff_vecs_t gopal_vecs = {
   gopal_args,
   CET_CHARSET_ASCII, 0 /* ascii is the expected character set */
   /* not fixed, can be changed through command line parameter */
+  , NULL_POS_OPS,
+  nullptr
 };
 /**************************************************************************/

diff --git a/gpssim.cc b/gpssim.cc
index ef3b64e9d74189ea8232507318aca5ad1567891b..40f1c95617cf2d3dcb16356527ccfe6e23a08e3e 100644 (file)
--- a/gpssim.cc
+++ b/gpssim.cc
@@ -39,11 +39,11 @@ static
 arglist_t gpssim_args[] = {
   {
     "wayptspd", &wayptspd, "Default speed for waypoints (knots/hr)",
-    NULL, ARGTYPE_FLOAT, ARG_NOMINMAX
+    NULL, ARGTYPE_FLOAT, ARG_NOMINMAX, nullptr
   },
   {
     "split", &splitfiles_opt, "Split input into separate files",
-    "0", ARGTYPE_BOOL, ARG_NOMINMAX
+    "0", ARGTYPE_BOOL, ARG_NOMINMAX, nullptr
   },
   ARG_TERMINATOR
 };
@@ -156,7 +156,7 @@ gpssim_trk_hdr(const route_head* rh)
 }
 
 static void
-gpssim_trk_ftr(const route_head* rh)
+gpssim_trk_ftr(const route_head*)
 {
   if (splitfiles) {
     gbfclose(fout);
@@ -203,4 +203,6 @@ ff_vecs_t gpssim_vecs = {
   NULL,
   gpssim_args,
   CET_CHARSET_ASCII, 0
+  , NULL_POS_OPS,
+  nullptr
 };

diff --git a/gpsutil.cc b/gpsutil.cc
index a43609d2c044aa27292e57c527b438d72b17351d..d1ec68a7517672a638e6c6dd53fd1c8d3abd777d 100644 (file)
--- a/gpsutil.cc
+++ b/gpsutil.cc
@@ -186,4 +186,6 @@ ff_vecs_t gpsutil_vecs = {
   NULL,
   NULL,
   CET_CHARSET_ASCII, 0 /* CET-REVIEW */
+  , NULL_POS_OPS,
+  nullptr
 };

diff --git a/gpx.cc b/gpx.cc
index 36701e52aab53b884ca40aa795065be34c029108..ccd5ab78c95da1b8ec68e1ed0323f6ddd32f058c 100644 (file)
--- a/gpx.cc
+++ b/gpx.cc
@@ -246,7 +246,7 @@ static inline QString toString(float f)
  * this allows gpx:wpt names to overlap gpx:rtept names, etc.
  */
 static void
-gpx_reset_short_handle(void)
+gpx_reset_short_handle()
 {
   if (mkshort_handle != NULL) {
     mkshort_del_handle(&mkshort_handle);
@@ -436,7 +436,7 @@ get_tag(const QString& t, int* passthrough)
 }
 
 static void
-prescan_tags(void)
+prescan_tags()
 {
   tag_mapping* tm;
   for (tm = tag_path_map; tm->tag_type_ != 0; tm++) {
@@ -874,7 +874,7 @@ xml_parse_time(const QString& dateTimeString)
 }
 
 static void
-gpx_end(const QString& el)
+gpx_end(const QString&) 
 {
   float x;
   int passthrough;
@@ -1216,7 +1216,7 @@ gpx_rd_init(const QString& fname)
 
 static
 void
-gpx_rd_deinit(void)
+gpx_rd_deinit()
 {
   delete reader;
   reader = NULL;
@@ -1331,7 +1331,7 @@ gpx_wr_init(const QString& fname)
 }
 
 static void
-gpx_wr_deinit(void)
+gpx_wr_deinit()
 {
   writer->writeEndDocument();
   delete writer;
@@ -1344,7 +1344,7 @@ gpx_wr_deinit(void)
 }
 
 void
-gpx_read(void)
+gpx_read()
 {
   for (bool atEnd = false; !reader->atEnd() && !atEnd;)  {
     reader->readNext();
@@ -1865,7 +1865,7 @@ gpx_waypt_bound_calc(const Waypoint* waypointp)
 }
 
 static void
-gpx_write_bounds(void)
+gpx_write_bounds()
 {
   waypt_init_bounds(&all_bounds);
 
@@ -1884,7 +1884,7 @@ gpx_write_bounds(void)
 }
 
 static void
-gpx_write(void)
+gpx_write()
 {
  
   gpx_reset_short_handle();
@@ -1898,7 +1898,7 @@ gpx_write(void)
 
 
 static void
-gpx_free_gpx_global(void)
+gpx_free_gpx_global()
 {
   gpx_rm_from_global(&gpx_global->name);
   gpx_rm_from_global(&gpx_global->desc);
@@ -1911,7 +1911,7 @@ gpx_free_gpx_global(void)
 }
 
 static void
-gpx_exit(void)
+gpx_exit()
 {
   gpx_version.clear();
 

diff --git a/gtm.cc b/gtm.cc
index 99ae66e5ed2757f02c16a6d04803a395a93cbb37..a23a6ee1607d507f4e9f0af195f620dba229dc48 100644 (file)
--- a/gtm.cc
+++ b/gtm.cc
@@ -431,16 +431,16 @@ gtm_rd_init(const QString& fname)
 }
 
 static void
-gtm_rd_deinit(void)
+gtm_rd_deinit()
 {
   gbfclose(file_in);
 }
 
-static void count_route_waypts(const Waypoint* wpt)
+static void count_route_waypts(const Waypoint*)
 {
   rt_count++;
 }
-static void count_track_waypts(const Waypoint* wpt)
+static void count_track_waypts(const Waypoint*)
 {
   tr_count++;
 }
@@ -501,13 +501,13 @@ gtm_wr_init(const QString& fname)
 }
 
 static void
-gtm_wr_deinit(void)
+gtm_wr_deinit()
 {
   gbfclose(file_out);
 }
 
 static void
-gtm_read(void)
+gtm_read()
 {
   route_head* first_trk_head = NULL;
   route_head* trk_head = NULL;
@@ -708,7 +708,7 @@ static void write_rte_waypt(const Waypoint* wpt)
 }
 
 static void
-gtm_write(void)
+gtm_write()
 {
   waypt_disp_all(write_waypt);
   if (waypt_count()) {
@@ -735,4 +735,7 @@ ff_vecs_t gtm_vecs = {
   gtm_write,
   NULL,
   gtm_args,
-};
+  CET_CHARSET_ASCII, 0, /* CET-REVIEW */
+  NULL_POS_OPS,
+  nullptr
+};
\ No newline at end of file

diff --git a/gtrnctr.cc b/gtrnctr.cc
index 14eb0d700e978a87553e0f0ef7855dd024945763..6134fb0f59b316c7f6d11668f217b4cd1f6fbe13 100644 (file)
--- a/gtrnctr.cc
+++ b/gtrnctr.cc
@@ -653,4 +653,6 @@ ff_vecs_t gtc_vecs = {
   NULL,
   gtc_args,
   CET_CHARSET_ASCII, 0 /* CET-REVIEW */
+  , NULL_POS_OPS,
+  nullptr
 };

diff --git a/height.cc b/height.cc
index 963cae6814dab5b4bf3132ae28e98cd10a7bff67..6a59bdd949b5efa0f93a88f1862d4ed44e4568e0 100644 (file)
--- a/height.cc
+++ b/height.cc
@@ -39,11 +39,11 @@ static
 arglist_t height_args[] = {
   {
     "add", &addopt, "Adds a constant value to every altitude (meter, append \"f\" (x.xxf) for feet)",
-    NULL, ARGTYPE_BEGIN_REQ | ARGTYPE_FLOAT, ARG_NOMINMAX
+    NULL, ARGTYPE_BEGIN_REQ | ARGTYPE_FLOAT, ARG_NOMINMAX, nullptr
   },
   {
     "wgs84tomsl", &wgs84tomslopt, "Converts WGS84 ellipsoidal height to orthometric height (MSL)",
-    NULL, ARGTYPE_END_REQ | ARGTYPE_BOOL, ARG_NOMINMAX
+    NULL, ARGTYPE_END_REQ | ARGTYPE_BOOL, ARG_NOMINMAX, nullptr
   },
   ARG_TERMINATOR
 };
@@ -122,7 +122,7 @@ correct_height(const Waypoint* wpt)
 
 
 static void
-height_init(const char* args)
+height_init(const char*)
 {
   char* unit;
 
@@ -141,7 +141,7 @@ height_init(const char* args)
 
 
 static void
-height_process(void)   /* this procedure must be present in vecs */
+height_process()       /* this procedure must be present in vecs */
 {
   waypt_disp_all(correct_height);
   route_disp_all(NULL, NULL, correct_height);

diff --git a/hiketech.cc b/hiketech.cc
index 1b37486614058683eabbdff9585b8d6cb4cc1470..cba08a70374e5983f1ae696b10cf30cddccfa20e 100644 (file)
--- a/hiketech.cc
+++ b/hiketech.cc
@@ -121,7 +121,7 @@ hiketech_trk_hdr(const route_head* rte)
 }
 
 static void
-hiketech_trk_tlr(const route_head* rte)
+hiketech_trk_tlr(const route_head*)
 {
   writer.writeEndElement(); // trk
 }
@@ -191,7 +191,7 @@ hiketech_write(void)
 }
 
 static
-void    ht_wpt_s(xg_string args, const QXmlStreamAttributes*)
+void    ht_wpt_s(xg_string, const QXmlStreamAttributes*)
 {
   wpt_tmp = new Waypoint;
 }
@@ -227,21 +227,21 @@ void      ht_alt(xg_string args, const QXmlStreamAttributes*)
 }
 
 static
-void   ht_wpt_e(xg_string args, const QXmlStreamAttributes*)
+void   ht_wpt_e(xg_string, const QXmlStreamAttributes*)
 {
   waypt_add(wpt_tmp);
   wpt_tmp = NULL;
 }
 
 static
-void   ht_trk_s(xg_string args, const QXmlStreamAttributes*)
+void   ht_trk_s(xg_string, const QXmlStreamAttributes*)
 {
   trk_head = route_head_alloc();
   track_add_head(trk_head);
 }
 
 static
-void   ht_trk_e(xg_string args, const QXmlStreamAttributes*)
+void   ht_trk_e(xg_string, const QXmlStreamAttributes*)
 {
 
 }
@@ -253,13 +253,13 @@ void      ht_trk_ident(xg_string args, const QXmlStreamAttributes*)
 }
 
 static
-void   ht_trk_pnt_s(xg_string args, const QXmlStreamAttributes*)
+void   ht_trk_pnt_s(xg_string, const QXmlStreamAttributes*)
 {
   wpt_tmp = new Waypoint;
 }
 
 static
-void   ht_trk_pnt_e(xg_string args, const QXmlStreamAttributes*)
+void   ht_trk_pnt_e(xg_string, const QXmlStreamAttributes*)
 {
   track_add_wpt(trk_head, wpt_tmp);
 }
@@ -315,5 +315,7 @@ ff_vecs_t hiketech_vecs = {
   NULL,
   hiketech_args,
   CET_CHARSET_ASCII, 0 /* CET-REVIEW */
+  , NULL_POS_OPS,
+  nullptr
 };
 

diff --git a/holux.cc b/holux.cc
index 42252520be504971320dbde28ab9846c5b474a90..37a8af9c2ff8e16c00f2d977290573828ab14dec 100644 (file)
--- a/holux.cc
+++ b/holux.cc
@@ -313,4 +313,6 @@ ff_vecs_t holux_vecs = {
   NULL,
   NULL,
   CET_CHARSET_ASCII, 0 /* CET-REVIEW */
+  , NULL_POS_OPS,
+  nullptr
 };

diff --git a/html.cc b/html.cc
index dd24447a9277b908428a8eda2b72160242760e79..78768f2e1cab177b3051cb40bfe60d1bd9d1cb96 100644 (file)
--- a/html.cc
+++ b/html.cc
@@ -41,23 +41,23 @@ static
 arglist_t html_args[] = {
   {
     "stylesheet", &stylesheet,
-    "Path to HTML style sheet", NULL, ARGTYPE_STRING, ARG_NOMINMAX
+    "Path to HTML style sheet", NULL, ARGTYPE_STRING, ARG_NOMINMAX, nullptr
   },
   {
     "encrypt", &html_encrypt,
-    "Encrypt hints using ROT13", NULL, ARGTYPE_BOOL, ARG_NOMINMAX
+    "Encrypt hints using ROT13", NULL, ARGTYPE_BOOL, ARG_NOMINMAX, nullptr
   },
   {
     "logs", &includelogs,
-    "Include groundspeak logs if present", NULL, ARGTYPE_BOOL, ARG_NOMINMAX
+    "Include groundspeak logs if present", NULL, ARGTYPE_BOOL, ARG_NOMINMAX, nullptr
   },
   {
     "degformat", &degformat,
-    "Degrees output as 'ddd', 'dmm'(default) or 'dms'", "dmm", ARGTYPE_STRING, ARG_NOMINMAX
+    "Degrees output as 'ddd', 'dmm'(default) or 'dms'", "dmm", ARGTYPE_STRING, ARG_NOMINMAX, nullptr
   },
   {
     "altunits", &altunits,
-    "Units for altitude (f)eet or (m)etres", "m", ARGTYPE_STRING, ARG_NOMINMAX
+    "Units for altitude (f)eet or (m)etres", "m", ARGTYPE_STRING, ARG_NOMINMAX, nullptr
   },
   ARG_TERMINATOR
 };
@@ -298,4 +298,6 @@ ff_vecs_t html_vecs = {
   NULL,
   html_args,
   CET_CHARSET_UTF8, 0  /* CET-REVIEW */
+  , NULL_POS_OPS,
+  nullptr
 };

diff --git a/humminbird.cc b/humminbird.cc
index 7159aa0e894ab6bb943fe7ab255e480af06bf79b..263c20fed3f403cdb777e7f5990c69ac6f931868 100644 (file)
--- a/humminbird.cc
+++ b/humminbird.cc
@@ -256,7 +256,7 @@ humminbird_rd_init(const QString& fname)
 }
 
 static void
-humminbird_rd_deinit(void)
+humminbird_rd_deinit()
 {
   gbfclose(fin);
 }
@@ -611,7 +611,7 @@ humminbird_read_track_old(gbfile* fin)
 }
 
 static void
-humminbird_read(void)
+humminbird_read()
 {
   while (! gbfeof(fin)) {
     uint32_t signature;
@@ -679,7 +679,7 @@ humminbird_wr_init(const QString& fname)
 }
 
 static void
-humminbird_wr_deinit(void)
+humminbird_wr_deinit()
 {
   mkshort_del_handle(&wptname_sh);
   mkshort_del_handle(&rtename_sh);
@@ -773,7 +773,7 @@ humminbird_track_head(const route_head* trk)
 }
 
 static void
-humminbird_track_tail(const route_head* rte)
+humminbird_track_tail(const route_head*)
 {
   int max_points = (131080 - sizeof(uint32_t)- sizeof(humminbird_trk_header_t)) / sizeof(humminbird_trk_point_t);
 
@@ -879,7 +879,7 @@ humminbird_track_cb(const Waypoint* wpt)
 
 
 static void
-humminbird_track_write(void)
+humminbird_track_write()
 {
 
   track_disp_all(humminbird_track_head, humminbird_track_tail, humminbird_track_cb);
@@ -968,7 +968,7 @@ humminbird_write_waypoint_wrapper(const Waypoint* wpt)
 }
 
 static void
-humminbird_write(void)
+humminbird_write()
 {
   waypt_disp_all(humminbird_write_waypoint_wrapper);
   route_disp_all(NULL, NULL, humminbird_write_waypoint_wrapper);
@@ -994,6 +994,8 @@ ff_vecs_t humminbird_vecs = {
   humminbird_args,
   CET_CHARSET_ASCII, 1                 /* ascii is the expected character set */
   /* currently fixed !!! */
+  , NULL_POS_OPS,
+  nullptr
 };
 
 /**************************************************************************/
@@ -1017,6 +1019,8 @@ ff_vecs_t humminbird_ht_vecs = {
   humminbird_args,
   CET_CHARSET_ASCII, 1                 /* ascii is the expected character set */
   /* currently fixed !!! */
+  , NULL_POS_OPS,
+  nullptr
 };
 
 /**************************************************************************/